From 49b19b64d3b36918ff4236b6c833a20b0cb40075 Mon Sep 17 00:00:00 2001 From: Jimi Xenidis Date: Fri, 18 Aug 2006 05:39:01 -0400 Subject: [PATCH] [XEN][POWERPC] Boot Module freeing - Fix bad logic that frees the modules anyway. - Allow for the absence of a Dom0 to continue execution until it's time to load it, useful for debugging bringup code. Signed-off-by: Jimi Xenidis Signed-off-by: Hollis Blanchard --- xen/arch/powerpc/domain_build.c | 5 +++++ xen/arch/powerpc/setup.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/xen/arch/powerpc/domain_build.c b/xen/arch/powerpc/domain_build.c index 8c896aa1ac..2cc93d58eb 100644 --- a/xen/arch/powerpc/domain_build.c +++ b/xen/arch/powerpc/domain_build.c @@ -118,13 +118,18 @@ int construct_dom0(struct domain *d, BUG_ON(d->domain_id != 0); BUG_ON(d->vcpu[0] == NULL); + if (image_len == 0) + panic("No Dom0 image supplied\n"); + cpu_init_vcpu(v); memset(&dsi, 0, sizeof(struct domain_setup_info)); dsi.image_addr = image_start; dsi.image_len = image_len; + printk("Trying Dom0 as 64bit ELF\n"); if ((rc = parseelfimage(&dsi)) != 0) { + printk("Trying Dom0 as 32bit ELF\n"); if ((rc = parseelfimage_32(&dsi)) != 0) return rc; am64 = 0; diff --git a/xen/arch/powerpc/setup.c b/xen/arch/powerpc/setup.c index 48978dd9db..21782178db 100644 --- a/xen/arch/powerpc/setup.c +++ b/xen/arch/powerpc/setup.c @@ -326,6 +326,9 @@ static void __init __start_xen(multiboot_info_t *mbi) for (i = 0; i < mbi->mods_count; i++) { u32 s; + if(mod[i].mod_end == mod[i].mod_start) + continue; + s = ALIGN_DOWN(mod[i].mod_start, PAGE_SIZE); if (mod[i].mod_start > (ulong)_start && @@ -337,7 +340,9 @@ static void __init __start_xen(multiboot_info_t *mbi) if (s < freemem) panic("module addresses must assend\n"); - freemem = free_xenheap(freemem, s); + free_xenheap(freemem, s); + freemem = ALIGN_UP(mod[i].mod_end, PAGE_SIZE); + } /* the rest of the xenheap, starting at the end of modules */ -- 2.30.2